Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:30:01 +0000 (09:30 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:30:01 +0000 (09:30 -0700)
commit2d7e212b68d18ba8cb907f5ea43df6e201e57f8e
tree79b7bf7dc51d09d0c112e46483c4bf2ff3734f89
parentd0c7951f498f38f95909abcba755fa8c3da38a07
parent03b36a73ed7e230124f59c0076acc07d422e00a5
Merge from trunk.